From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 28 Dec 2014 23:59:35 +0000 (+0100)
Subject: PCI: Avoid ABI change in 3.16.7-ckt3
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~26^2^2~4
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de//%22style.css/%22/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de/%22style.css/%22?a=commitdiff_plain;h=accce744cc5fcf06d422715ced01da1a78e258a2;p=linux-4.9.git

PCI: Avoid ABI change in 3.16.7-ckt3

Move the added bitfield pci_dev::no_64bit_msi to the end of its
bitfield group and hide it from genksyms.


Gbp-Pq: Topic debian
Gbp-Pq: Name pci-fix-abi-change-in-3.16.7-ckt3.patch
---

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 16b51b65eb2e..653367c72e59 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -331,7 +331,6 @@ struct pci_dev {
 	unsigned int	is_added:1;
 	unsigned int	is_busmaster:1; /* device is busmaster */
 	unsigned int	no_msi:1;	/* device may not use msi */
-	unsigned int	no_64bit_msi:1; /* device may only use 32-bit MSIs */
 	unsigned int	block_cfg_access:1;	/* config space access is blocked */
 	unsigned int	broken_parity_status:1;	/* Device generates false positive parity */
 	unsigned int	irq_reroute_variant:2;	/* device needs IRQ rerouting variant */
@@ -349,6 +348,10 @@ struct pci_dev {
 	unsigned int	__aer_firmware_first:1;
 	unsigned int	broken_intx_masking:1;
 	unsigned int	io_window_1k:1;	/* Intel P2P bridge 1K I/O windows */
+#ifndef __GENKSYMS__
+	unsigned int	no_64bit_msi:1; /* device may only use 32-bit MSIs */
+	/* 8 bits spare */
+#endif
 	pci_dev_flags_t dev_flags;
 	atomic_t	enable_cnt;	/* pci_enable_device has been called */